From 4923da3550d06d9b5cedee8a41e3cff7e0ea5fc5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 31 Dec 2017 12:49:53 -0500 Subject: [PATCH] Drop gtk_true and gtk_false These functions are entirely trivial, their documentation is much longer than their implementation, and it contains an example that is annotated as "don't do this"... --- docs/reference/gtk/gtk4-sections.txt | 4 -- gtk/gtkmain.c | 67 ---------------------------- gtk/gtkmain.h | 5 --- 3 files changed, 76 deletions(-) diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index efa3d4f9e3..658504401e 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -4814,10 +4814,6 @@ gtk_main_do_event GtkModuleInitFunc GtkModuleDisplayInitFunc - -gtk_true -gtk_false - gtk_grab_add gtk_grab_get_current diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index c0e299f180..fcd1f363bc 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -1906,73 +1906,6 @@ gtk_main_do_event (GdkEvent *event) g_object_unref (rewritten_event); } -/** - * gtk_true: - * - * All this function does it to return %TRUE. - * - * This can be useful for example if you want to inhibit the deletion - * of a window. Of course you should not do this as the user expects - * a reaction from clicking the close icon of the window... - * - * ## A persistent window - * - * |[ - * #include - * - * int - * main (int argc, char **argv) - * { - * GtkWidget *win, *but; - * const char *text = "Close yourself. I mean it!"; - * - * gtk_init (&argc, &argv); - * - * win = gtk_window_new (GTK_WINDOW_TOPLEVEL); - * g_signal_connect (win, - * "delete-event", - * G_CALLBACK (gtk_true), - * NULL); - * g_signal_connect (win, "destroy", - * G_CALLBACK (gtk_main_quit), - * NULL); - * - * but = gtk_button_new_with_label (text); - * g_signal_connect_swapped (but, "clicked", - * G_CALLBACK (gtk_object_destroy), - * win); - * gtk_container_add (GTK_CONTAINER (win), but); - * - * gtk_widget_show (win); - * - * gtk_main (); - * - * return 0; - * } - * ]| - * - * Returns: %TRUE - */ -gboolean -gtk_true (void) -{ - return TRUE; -} - -/** - * gtk_false: - * - * Analogical to gtk_true(), this function does nothing - * but always returns %FALSE. - * - * Returns: %FALSE - */ -gboolean -gtk_false (void) -{ - return FALSE; -} - static GtkWindowGroup * gtk_main_get_window_group (GtkWidget *widget) { diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h index 726b14650f..2a161198ae 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -119,11 +119,6 @@ gboolean gtk_main_iteration (void); GDK_AVAILABLE_IN_ALL gboolean gtk_main_iteration_do (gboolean blocking); -GDK_AVAILABLE_IN_ALL -gboolean gtk_true (void) G_GNUC_CONST; -GDK_AVAILABLE_IN_ALL -gboolean gtk_false (void) G_GNUC_CONST; - GDK_AVAILABLE_IN_ALL void gtk_grab_add (GtkWidget *widget); GDK_AVAILABLE_IN_ALL -- 2.30.2